dd07809f3fe5df84a4d0e103dbb7aefc7694344c,opennms-tools/mib2events/src/main/java/org/opennms/netmgt/mib2events/Mib2Events.java,Mib2Events,getTrapEvent,#MibValueSymbol#String#,442

Before Change



    public Event getTrapEvent(MibValueSymbol trapValueSymbol, String ueibase) {
        Event evt = new Event();
        Mask mask = new Mask();
        Maskelement me;

        // Set the event's UEI, event-label, logmsg, severity, and descr
        evt.setUei(getTrapEventUEI(trapValueSymbol, ueibase));
        evt.setEventLabel(getTrapEventLabel(trapValueSymbol));
        evt.setLogmsg(getTrapEventLogmsg(trapValueSymbol));
        evt.setSeverity("Indeterminate");
        evt.setDescr(getTrapEventDescr(trapValueSymbol));

        if (!m_compat) {
            //evt.setAlarmData(getTrapEventAlarmData());
        }

        if (!m_compat) {
            List<Varbindsdecode> decode = getTrapVarbindsDecode(trapValueSymbol);
            if (!decode.isEmpty()) {
                evt.setVarbindsdecode(decode);
            }
        }

        // Construct the event mask object
        // The "ID" mask element (trap enterprise)
        me = new Maskelement();
        me.setMename("id");
        me.addMevalue(getTrapEnterprise(trapValueSymbol));
        mask.addMaskelement(me);

        // The "generic" mask element (hard-wired to enterprise-specific(6))
        me = new Maskelement();
        me.setMename("generic");
        me.addMevalue("6");
        mask.addMaskelement(me);

        // The "specific" mask element (trap specific-type)
        me = new Maskelement();
        me.setMename("specific");
        me.addMevalue(getTrapSpecificType(trapValueSymbol));
        mask.addMaskelement(me);

        evt.setMask(mask);

        return evt;
    }

After Change


            }
        }

        evt.setMask(new Mask());

        // The "ID" mask element (trap enterprise)
        addMaskElement(evt, "id", getTrapEnterprise(trapValueSymbol));

        // The "generic" mask element: hard-wired to enterprise-specific(6)
        addMaskElement(evt, "generic", "6");

        // The "specific" mask element (trap specific-type)
        addMaskElement(evt, "specific", getTrapSpecificType(trapValueSymbol));